From f4575fb04ab7840022196ca55a27080ce1c67e23 Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Tue, 13 Mar 2007 09:52:51 +0000 Subject: [PATCH] [XM-TEST] vTPM test changes Remove an uninitialized variable. For some reason the 'ps aux' command does not see the process anymore (since some time on the weekend). Need to add 'COLUMNS=n'. Signed-off-by: Stefan Berger --- tools/xm-test/tests/vtpm/09_vtpm-xapi.py | 2 +- tools/xm-test/tests/vtpm/vtpm_utils.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py index 6de28805d3..15775801f6 100644 --- a/tools/xm-test/tests/vtpm/09_vtpm-xapi.py +++ b/tools/xm-test/tests/vtpm/09_vtpm-xapi.py @@ -91,7 +91,7 @@ if vtpm_uuid not in vm_vtpms: try: console = domain.start() except DomainError, e: - FAIL("Unable to create domain (%s)" % domName) + FAIL("Unable to create domain (%s)") try: console.sendInput("input") diff --git a/tools/xm-test/tests/vtpm/vtpm_utils.py b/tools/xm-test/tests/vtpm/vtpm_utils.py index 0af46574c9..da65aab5fb 100644 --- a/tools/xm-test/tests/vtpm/vtpm_utils.py +++ b/tools/xm-test/tests/vtpm/vtpm_utils.py @@ -8,7 +8,8 @@ from XmTestLib import * if ENABLE_HVM_SUPPORT: SKIP("vtpm tests not supported for HVM domains") -status, output = traceCommand("ps aux | grep vtpm_manager | grep -v grep") +status, output = traceCommand("COLUMNS=200 ; " + "ps aux | grep vtpm_manager | grep -v grep") if output == "": SKIP("virtual TPM manager must be started to run this test; might " "need /dev/tpm0") -- 2.30.2